From cae6c15d6519cd444af749427cfe87f29659652c Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 20 Feb 2006 11:07:25 +0000 Subject: [PATCH] Fix typo so ctrl gets passed on to the gdk event. 2006-02-20 Anders Carlsson * gdk/quartz/gdkevents-quartz.c: (get_keyboard_modifiers_from_nsevent): Fix typo so ctrl gets passed on to the gdk event. * gdk/quartz/gdkproperty-quartz.c: (gdk_atom_name): g_strdup the atom name. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ gdk/quartz/gdkevents-quartz.c | 2 +- gdk/quartz/gdkproperty-quartz.c | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 908d53e2a3..c007727cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-02-20 Anders Carlsson + + * gdk/quartz/gdkevents-quartz.c: + (get_keyboard_modifiers_from_nsevent): + Fix typo so ctrl gets passed on to the gdk event. + + * gdk/quartz/gdkproperty-quartz.c: + (gdk_atom_name): + g_strdup the atom name. + 2006-02-20 Tor Lillqvist * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 908d53e2a3..c007727cbc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2006-02-20 Anders Carlsson + + * gdk/quartz/gdkevents-quartz.c: + (get_keyboard_modifiers_from_nsevent): + Fix typo so ctrl gets passed on to the gdk event. + + * gdk/quartz/gdkproperty-quartz.c: + (gdk_atom_name): + g_strdup the atom name. + 2006-02-20 Tor Lillqvist * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 7b8c8132e3..e5470bbc7f 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -612,7 +612,7 @@ get_keyboard_modifiers_from_nsevent (NSEvent *nsevent) modifiers |= GDK_SHIFT_MASK; if (nsflags & NSControlKeyMask) modifiers |= GDK_CONTROL_MASK; - if (nsflags & NSControlKeyMask) + if (nsflags & NSCommandKeyMask) modifiers |= GDK_MOD1_MASK; /* FIXME: Support GDK_BUTTON_MASK */ diff --git a/gdk/quartz/gdkproperty-quartz.c b/gdk/quartz/gdkproperty-quartz.c index 0456d25e25..c006c195f1 100644 --- a/gdk/quartz/gdkproperty-quartz.c +++ b/gdk/quartz/gdkproperty-quartz.c @@ -170,7 +170,7 @@ gdk_atom_name (GdkAtom atom) if (GPOINTER_TO_INT (atom) >= atoms_to_names->len) return NULL; - return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)); + return g_strdup (g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom))); } void -- 2.30.2